Autogenerated HTML docs for v2.4.1-217-g6c124
diff --git a/git-merge.txt b/git-merge.txt index 1f94908..273a100 100644 --- a/git-merge.txt +++ b/git-merge.txt
@@ -104,6 +104,10 @@ If no commit is given from the command line, merge the remote-tracking branches that the current branch is configured to use as its upstream. See also the configuration section of this manual page. ++ +When `FETCH_HEAD` (and no other commit) is specified, the branches +recorded in the `.git/FETCH_HEAD` file by the previous invocation +of `git fetch` for merging are merged to the current branch. PRE-MERGE CHECKS
